Merge changes from emacs-24 branch
authorChong Yidong <cyd@gnu.org>
Fri, 27 Apr 2012 03:10:38 +0000 (11:10 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 27 Apr 2012 03:10:38 +0000 (11:10 +0800)
commit97dc087fc99bf6a776093cd7e2889e48b0c11f06
tree96e34e7b600c6e63f37de10bf82d87d2806cded4
parentda7cf6eeb4d5c58c2e8a2e826d5e08d6faaf658d
parent43f5e4d2202ebd5d3bcc05a741d9000a1b9e0a66
Merge changes from emacs-24 branch
48 files changed:
doc/emacs/ChangeLog
doc/emacs/ack.texi
doc/lispref/ChangeLog
doc/lispref/buffers.texi
doc/lispref/commands.texi
doc/lispref/compile.texi
doc/lispref/control.texi
doc/lispref/customize.texi
doc/lispref/display.texi
doc/lispref/eval.texi
doc/lispref/files.texi
doc/lispref/frames.texi
doc/lispref/functions.texi
doc/lispref/hash.texi
doc/lispref/help.texi
doc/lispref/intro.texi
doc/lispref/keymaps.texi
doc/lispref/lists.texi
doc/lispref/macros.texi
doc/lispref/minibuf.texi
doc/lispref/modes.texi
doc/lispref/numbers.texi
doc/lispref/objects.texi
doc/lispref/streams.texi
doc/lispref/symbols.texi
doc/lispref/syntax.texi
doc/lispref/text.texi
doc/lispref/tips.texi
doc/lispref/variables.texi
doc/lispref/windows.texi
doc/misc/ChangeLog
etc/ChangeLog
etc/NEWS
lisp/ChangeLog
lisp/gnus/ChangeLog
lisp/mouse.el
lisp/org/ChangeLog
lisp/progmodes/gdb-mi.el
lisp/progmodes/which-func.el
lisp/simple.el
lisp/startup.el
lisp/subr.el
lisp/vc/vc-git.el
lisp/window.el
src/ChangeLog
src/fileio.c
src/window.c
src/xdisp.c